build: Remove 'enable' prefix from option names

Meson options are typed, so the prefix isn't necessary, and indeed
looks odd when used to disable the option:
 -Denable_foo=false

Also replace underscores with dashes, which is the preferred meson
style.

https://bugzilla.gnome.org/show_bug.cgi?id=791007

diff --git a/meson.build b/meson.build
index 48771ebd7d1643a51e8eaa84b1ce464e4150665f..b0b6e9b4e92a99e018b15cb060465e1979c3e0ab 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -102,7 +102,7 @@ if enable_recorder
 endif
 
 nm_deps = []
-enable_networkmanager = get_option('enable-networkmanager')
+enable_networkmanager = get_option('networkmanager')
 if enable_networkmanager != 'no'
   want_networkmanager = enable_networkmanager == 'yes'
 
@@ -131,7 +131,7 @@ else
   have_networkmanager = false
 endif
 
-enable_systemd = get_option('enable-systemd')
+enable_systemd = get_option('systemd')
 if enable_systemd != 'no'
   want_systemd = enable_systemd == 'yes'
   systemd_dep = dependency('libsystemd', required: want_systemd)
@@ -141,15 +141,13 @@ else
   have_systemd = false
 endif
 
-enable_plugin = get_option('enable-browser-plugin')
-if enable_plugin
+if get_option('browser_plugin')
   json_glib_dep = dependency('json-glib-1.0', version: json_glib_req)
 
   subdir('browser-plugin')
 endif
 
-enable_man = get_option('enable-man')
-if enable_man
+if get_option('man')
   xsltproc = find_program('xsltproc')
 
   subdir('man')
@@ -204,6 +202,6 @@ subdir('po')
 subdir('data')
 subdir('tests')
 
-if get_option('enable-documentation')
+if get_option('gtk_doc')
   subdir('docs/reference')
 endif

diff --git a/meson_options.txt b/meson_options.txt
index 18899ffdb903d135254ec3d3f9771ce6e6b1bc18..c6a9e550e9cf7ca8d0cf726105f1205bac274a53 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,29 +1,29 @@
-option('enable-browser-plugin',
+option('browser_plugin',
   type: 'boolean',
   value: true,
   description: 'Enable extensions.gnome.org browser plugin'
 )
 
-option('enable-documentation',
+option('gtk_doc',
   type: 'boolean',
   value: false,
   description: 'Build API reference'
 )
 
-option('enable-man',
+option('man',
   type: 'boolean',
   value: true,
   description: 'Generate man pages'
 )
 
-option('enable-networkmanager',
+option('networkmanager',
   type: 'combo',
   choices: ['yes', 'no', 'auto'],
   value: 'auto',
   description: 'Enable NetworkManager support'
 )
 
-option('enable-systemd',
+option('systemd',
   type: 'combo',
   choices: ['yes', 'no', 'auto'],
   value: 'auto',